Improve support for Garmin address fields.

diff --git a/reference/garmin_txt-uni.csv b/reference/garmin_txt-uni.csv
index 1377040bf5292b21f07dc43ecf7d8e8cad9f64f7..51ba3799b70b1e903e3038a33466b7fcb9af9429 100644 (file)
--- a/reference/garmin_txt-uni.csv
+++ b/reference/garmin_txt-uni.csv
@@ -1,57 +1,15 @@
-No,Latitude,Longitude,Name,Altitude,Description,Symbol,Date,Time,URL\r
-1,50.492603,12.105431,"001",,"001","Waypoint",2006/03/28,00:10:37,\r
-2,50.492603,12.105431,"002",,"002","Waypoint",2006/03/28,00:10:37,\r
-3,50.494277,12.105130,"003",,"003","Waypoint",2006/03/28,00:10:37,\r
-4,50.493834,12.106101,"004",,"004","Waypoint",2006/03/28,00:10:37,\r
-5,50.493834,12.106101,"005",,"005","Waypoint",2006/03/28,00:10:37,\r
-6,50.493376,12.107105,"006",,"006","Waypoint",2006/03/28,00:10:37,\r
-7,50.493660,12.107152,"007",,"007","Waypoint",2006/03/28,00:10:37,\r
-8,51.893799,12.977943,"ED_X",,"Dummy airport (Germany)","Airport",2006/03/28,01:38:07,\r
-9,38.631995,-3.174055,"GC_X",,"Dummy airport (Spain)","Airport",2006/03/28,01:42:01,\r
-10,50.493667,12.107150,"Jahnstrasse",,"Jahnstrasse 11","Flag, Red",2006/03/31,21:48:22,\r
-11,46.387606,3.498277,"LF_X",,"Dummy airport (France)","Airport",2006/03/28,01:40:32,\r
-12,50.493834,12.106100,"Liebknechtstrasse",,"Liebknechtstrasse 90","Waypoint",2006/03/31,21:49:30,\r
-13,43.314550,12.161554,"LI_X",,"Dummy airport (Italy)","Heliport",2006/03/28,01:43:25,\r
-14,50.492616,12.105448,"NARVA",391.0,"Start","Flag, Green",2006/03/31,21:49:26,"http://www.narva-light.de"\r
-15,51.312938,12.413165,"RPT015",161.0,"RPT015","Waypoint",2005/05/01,15:02:47,\r
-16,51.312883,12.413248,"RPT016",154.0,"RPT016","Waypoint",2005/05/01,15:03:25,\r
-17,51.312855,12.413248,"RPT017",148.0,"RPT017","Waypoint",2005/05/01,15:03:39,\r
-18,51.312827,12.413304,"RPT018",139.0,"RPT018","Waypoint",2005/05/01,15:04:16,\r
-19,51.312827,12.413276,"RPT019",145.0,"RPT019","Waypoint",2005/05/01,15:05:02,\r
-20,51.312827,12.413304,"RPT020",134.0,"RPT020","Waypoint",2005/05/01,15:05:45,\r
-21,51.312772,12.413332,"RPT021",131.0,"RPT021","Waypoint",2005/05/01,15:06:44,\r
-22,51.312772,12.413332,"RPT022",130.0,"RPT022","Waypoint",2005/05/01,15:07:50,\r
-23,51.312744,12.413332,"RPT023",132.0,"RPT023","Waypoint",2005/05/01,15:08:19,\r
-24,51.312799,12.413304,"RPT024",144.0,"RPT024","Waypoint",2005/05/01,15:11:16,\r
-25,51.312911,12.413443,"RPT025",147.0,"RPT025","Waypoint",2005/05/01,15:12:34,\r
-26,51.312994,12.413804,"RPT026",145.0,"RPT026","Waypoint",2005/05/01,15:13:18,\r
-27,51.313049,12.413804,"RPT027",145.0,"RPT027","Waypoint",2005/05/01,15:13:27,\r
-28,51.313049,12.413832,"RPT028",135.0,"RPT028","Waypoint",2005/05/01,15:13:37,\r
-29,51.313105,12.413832,"RPT029",135.0,"RPT029","Waypoint",2005/05/01,15:13:46,\r
-30,51.313216,12.413887,"RPT030",136.0,"RPT030","Waypoint",2005/05/01,15:14:03,\r
-31,51.313299,12.413971,"RPT031",135.0,"RPT031","Waypoint",2005/05/01,15:14:16,\r
-32,51.313272,12.414054,"RPT032",139.0,"RPT032","Waypoint",2005/05/01,15:14:26,\r
-33,51.313272,12.414110,"RPT033",139.0,"RPT033","Waypoint",2005/05/01,15:14:30,\r
-34,51.313049,12.414610,"RPT034",141.0,"RPT034","Waypoint",2005/05/01,15:15:06,\r
-35,51.312966,12.414832,"RPT035",140.0,"RPT035","Waypoint",2005/05/01,15:15:27,\r
-36,51.312911,12.414943,"RPT036",140.0,"RPT036","Waypoint",2005/05/01,15:15:39,\r
-37,51.312938,12.414971,"RPT037",152.0,"RPT037","Waypoint",2005/05/01,15:25:31,\r
-38,51.312938,12.414971,"RPT038",152.0,"RPT038","Waypoint",2005/05/01,15:25:40,\r
-39,51.312966,12.414943,"RPT039",155.0,"RPT039","Waypoint",2005/05/01,15:29:18,\r
-40,51.313160,12.414582,"RPT040",149.0,"RPT040","Waypoint",2005/05/01,15:30:30,\r
-41,51.313160,12.414554,"RPT041",150.0,"RPT041","Waypoint",2005/05/01,15:30:37,\r
-42,51.313160,12.414443,"RPT042",151.0,"RPT042","Waypoint",2005/05/01,15:30:47,\r
-43,51.313160,12.414387,"RPT043",151.0,"RPT043","Waypoint",2005/05/01,15:30:48,\r
-44,51.313327,12.413915,"RPT044",150.0,"RPT044","Waypoint",2005/05/01,15:30:52,\r
-45,51.313688,12.413332,"RPT045",150.0,"RPT045","Waypoint",2005/05/01,15:30:57,\r
-46,51.313994,12.412860,"RPT046",150.0,"RPT046","Waypoint",2005/05/01,15:31:03,\r
-47,51.314216,12.412498,"RPT047",150.0,"RPT047","Waypoint",2005/05/01,15:31:10,\r
-48,51.314633,12.409554,"RPT048",143.0,"RPT048","Waypoint",2005/05/01,15:32:38,\r
-49,51.314633,12.409499,"RPT049",141.0,"RPT049","Waypoint",2005/05/01,15:32:45,\r
-50,51.314633,12.409499,"RPT050",143.0,"RPT050","Waypoint",2005/05/01,15:33:17,\r
-51,51.314633,12.409443,"RPT051",139.0,"RPT051","Waypoint",2005/05/01,15:33:42,\r
-52,51.314633,12.409360,"RPT052",139.0,"RPT052","Waypoint",2005/05/01,15:33:54,\r
-53,51.314633,12.409360,"RPT053",138.0,"RPT053","Waypoint",2005/05/01,15:34:04,\r
-54,51.314633,12.409360,"RPT054",139.0,"RPT054","Waypoint",2005/05/01,15:34:20,\r
-55,51.314633,12.409360,"RPT055",144.0,"RPT055","Waypoint",2005/05/01,15:35:45,\r
-56,51.314633,12.409360,"RPT056",145.0,"RPT056","Waypoint",2005/05/01,15:35:56,\r
+No,Latitude,Longitude,Name,Altitude,Description,Symbol,Date,Time,URL,Facility,City,Country\r
+1,50.492603,12.105431,"001",,"001","Waypoint",2006/03/28,00:10:37,,,,\r
+2,50.492603,12.105431,"002",,"002","Waypoint",2006/03/28,00:10:37,,,,\r
+3,50.494277,12.105130,"003",,"003","Waypoint",2006/03/28,00:10:37,,,,\r
+4,50.493834,12.106101,"004",,"004","Waypoint",2006/03/28,00:10:37,,,,\r
+5,50.493834,12.106101,"005",,"005","Waypoint",2006/03/28,00:10:37,,,,\r
+6,50.493376,12.107105,"006",,"006","Waypoint",2006/03/28,00:10:37,,,,\r
+7,50.493660,12.107152,"007",,"007","Waypoint",2006/03/28,00:10:37,,,,\r
+8,51.893799,12.977943,"ED_X",,"Dummy airport (Germany)","Airport",2006/03/28,01:38:07,,"FAC1","CITY1","Germany"\r
+9,38.631995,-3.174055,"GC_X",,"Dummy airport (Spain)","Airport",2006/03/28,01:42:01,,"FAC2","CITY2","Canary Island"\r
+10,50.493667,12.107150,"Jahnstrasse",,"Jahnstrasse 11","Flag, Red",2006/03/31,21:48:22,,,,\r
+11,46.387606,3.498277,"LF_X",,"Dummy airport (France)","Airport",2006/03/28,01:40:32,,"FAC3","CITY3","France"\r
+12,50.493834,12.106100,"Liebknechtstrasse",,"Liebknechtstrasse 90","Waypoint",2006/03/31,21:49:30,,,,\r
+13,43.314550,12.161554,"LI_X",,"Dummy airport (Italy)","Heliport",2006/03/28,01:43:25,,"FAC4","CITY4","Italy"\r
+14,50.492616,12.105448,"NARVA",391.0,"Start","Flag, Green",2006/03/31,21:49:26,"http://www.narva-light.de",,,\r

diff --git a/reference/gpi_ext-sample.csv b/reference/gpi_ext-sample.csv
new file mode 100644 (file)
index 0000000..170bf4b
--- /dev/null
+++ b/reference/gpi_ext-sample.csv
@@ -0,0 +1,10 @@
+No,Latitude,Longitude,Name,Description,Symbol,Address,City,PostalCode,State,Country,Phone\r
+1,50.877341,12.433889,"3","! constructed waypoint !","Waypoint","Hauptstrasse -1",,,,,"03741-999999"\r
+2,50.964955,12.435919,"Altenburg-Umgehung","! constructed waypoint !","Waypoint",,"Plauen",,,,"03741-999999"\r
+3,50.610795,12.173802,"Elsterberg","! constructed waypoint !","Waypoint",,,,"Sachsen",,"03741-999999"\r
+4,50.844126,12.408757,"Gosel","! constructed waypoint !","Waypoint",,,,,"Deutschland","03741-999999"\r
+5,50.654763,12.204957,"Greiz","! constructed waypoint !","Waypoint",,,"08523",,,"03741-999999"\r
+6,51.314521,12.409143,"HMMMM","No comment","Waypoint","Hauptstrasse -2","Plauen","08523","Sachsen","Deutschland","03741-999999"\r
+7,50.493663,12.107153,"Jahnstrasse","! constructed waypoint !","Waypoint",,,"08523",,"Deutschland","03741-999999"\r
+8,50.493837,12.106101,"Liebknechtstrasse","! constructed waypoint !","Waypoint",,,"08523",,"Deutschland","03741-999999"\r
+9,50.492619,12.105449,"NARVA","Start","Waypoint",,,"08523",,"Deutschland","03741-999999"\r

diff --git a/reference/gpi_ext-sample.gpi b/reference/gpi_ext-sample.gpi
new file mode 100644 (file)
index 0000000..62d6fa8
Binary files /dev/null and b/reference/gpi_ext-sample.gpi differ

diff --git a/reference/multiple-links.gpx b/reference/multiple-links.gpx
index 0e347db8e70c34872b206e51c348b0080e9feae1..448a465a30550246a819cf9f8c25bd4ecfb6a615 100644 (file)
--- a/reference/multiple-links.gpx
+++ b/reference/multiple-links.gpx
@@ -27,7 +27,7 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/
   </link>
   <sym>Waypoint</sym>
   <extensions>
-    <gpxx:WaypointExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/GpxExtensions/v2 http://www.garmin.com/xmlschemas/GpxExtensions/v2/GpxExtensionsv2.xsd">
+    <gpxx:WaypointExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensions/v3/GpxExtensionsv3.xsd">
       <gpxx:DisplayMode>SymbolAndDescription</gpxx:DisplayMode>
     </gpxx:WaypointExtension>
   </extensions>

diff --git a/xmldoc/formats/unicsv.xml b/xmldoc/formats/unicsv.xml
index 00fa2fa4f706cbcc9762bf76b0ab8ef85ed771bc..9574c230cf15d0e1cd8ebbfd3a624a580bd3c464 100644 (file)
--- a/xmldoc/formats/unicsv.xml
+++ b/xmldoc/formats/unicsv.xml
@@ -57,6 +57,23 @@
       y_pos =    Latitude
       z =        Altitude (elevation)
    </screen>
+   We are also support some enhanced Garmin attributes. They are also available in 
+   <link linkend="fmt_gpx">gpx</link>, <link linkend="fmt_gdb">gdb</link>, 
+   <link linkend="fmt_garmin_gpi">garmin_gpi</link> and partly 
+   <link linkend="fmt_garmin_txt">garmin_txt</link>. All this entities are currently 
+   not visible in <productname>MapSource</productname> (6.12.4), but are NOT dropped  
+   when working with GDB (version 3) or GPX files.
+   <screen></screen>
+   Please note, that all of them are NOT really a part of geocoding services.
+   <screen>
+      addr =     Street address
+      city =     City
+      country =  Country
+      faci =     Facility (not available in GPX)
+      phone =    Phone number
+      post =     Postal code
+      state =    State
+   </screen>
    Fuller spellings (i.e. "longitude") may be used. You can also
    use keywords with a whitespace instead of an underscore.
 </para>